Auto merge of #1149 - rndr:issue-1146, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 11 Jan 2015 04:36:17 +0000 (04:36 +0000)
committerbors <bors@rust-lang.org>
Sun, 11 Jan 2015 04:36:17 +0000 (04:36 +0000)
commit027c815aeb5a8156f0e1c9000604ffc5a1053468
treee06f590dff39f3d102ade3bdfdea364fce0d66d8
parentc2c6f407441bff66224cc940e84eef2cc14a99bc
parentdb7382981619a9ba0612f632d5512bf59d1d8c21
Auto merge of #1149 - rndr:issue-1146, r=alexcrichton

Closes #1146